Spec test cleanup