Basic tests for #12

Still requires some more extensive tests