Moved tests to new folder