All three tests finally passing