Fix weird issue where nose all of a sudden doesn't discover tests
Merge branch 'develop' into feature/fix_unit_tests