Fix port tests