Finally fixed tests after finding fatal error in Shortener
Added JSON services in app controller
Tidy up after merge