Adding a few additional tests, ready for another look