Controller tests

merge this after voting ones, have chris check locally for confilcts