Valgrind fixes in tester; found no key-dependent branches of course:)