Cleaned the tests somewhat.