Moved tests to test forlder