TestCase controller improvements