Moving cleanup to beginning of spec instead of after
Error message was not better, it turns out