fixes, port tests