WIP: Add tests

Erick Hitter requested to merge add/tests into develop

Merge request reports