updated/fixed unit tests