Update test to be cleaner.