Updated unit tests.
More unit tests added and debugged.