Added src test directory
Tidied things up in the controller