Some model tweaks and tests