PUBSTWO-911

* Removed failing test, it was testing a controller that doesn't do anything
* Also some formatting