Added some tests (that pass)