clean up controller test code