Cleaned up test a bit.