Repair some tests. #159
Merge branch 'feature/fix_regression_tests' into develop