- refactored the tests so they are a bit more dry