fixed unit tests to match extended functionality