- added more unit tests