Multiple test fixes

:+1: