Controller tests and changes