Added the new unit tests...
Fixed a bug in test.c++