Updated tests

Fu, Andyrequested to merge
clean_up into master

Cleaned up tests and code, merge with master before continuing on docker.

Merge request reports