Cleaned up main test file a bit