added a few more tests?