Moved tests to another file