Adding some tests, one test currently fails