Cleaned up some test code
Shortened all constant strings