Controllertest

Tested on amigo and somethings added. Can be merged into master