Small bug fixed in unit testing. More tests added.