UI: tidy up stations modules & fix tests
UI: fix more broken tests