Moved tests to own file