Tests passing, db settings & game model tweaks