[#547] Fixes to final test fails