Unit test

Unit test changes - improved code coverage