Switched to simple TestCase