Tests refactoring - now much simpler