Moved tests to a new file