Cleaned up tests. Moved pto to us and renamed files