more changing around, tests need to start again