last of the tests moved over