passing tests on reset branch, unmerged with Blahah/transrate-master