Moved tests to one file