Make controller abstract test more flexible