Added a couple of tests, many more to do