Newly added unit tests