Moving more tests, message fixes