Moved individual tests into main Test folder