fixing unit tests after transfer! changes
change names to match new protocol
fixing unit tests