Extended unit tests

Have extended the unit tests. Please pull in the changes