Misc unit tests
Unit test framework updated