Renamed self test into controller in preparation of offloading all that logic there