1) Added a few more unit tests