refactoring, more use of doubles, one re-written test in station.