Moved tests to a more appropriately named directory