updated couple unit tests