Updated tests. Played with controller starting.