Working commit for new test suite