DRY up the tests
Polish