Junit testing

Merged noosphere888 requested to merge junit-testing into develop

Merge request reports