More passing unit tests