Added some tests, made them all go green