move two tests to the right place