Tidying up SpectrumWarsDisplay controller and tests