Added some new unittests for better coverage