Moved over rest of the tests