More Controller tests
add integration tests
finalize integration tests
finalize integration tests