Feature/tests controller

See #313