hamcrest doesn't like unicode assertion messages
Merge branch 'broken_func_key_tests'