Move more tests to last part.