add autoactivate transfer test, refactor