great fixes - more tests covered