added a few more unit tests