Added required unit tests (converted from existing ones)