Refactor of DockingStation spec