Cleaned up unnecessary "stuff" in test.