Refactoring: Unit tests tidying up.