Tests still failing. Almost there