Updated phpDoc and updated modeltests