Cleaner and more maintainable test suite