Updated test locations
Cleaned up some code.