Remove old TestCase code, and move to purely Spec tests