More tests moved over
Move more tests over