Controller tests done, or almost done