Added sanity tests, we've got a bit of work to do still...