More rest tests and added controller stuff