Moved some test related files