Made alterations to the initial testsuite, easier to keep up here