Controller tests

Please review muh code