Finished, all files checked, removed redundant unittests