make tests pass
Merge branch 'testing_branch' into develop