Completed refactoring of Station tests