Moved tests to the proper folder