Fix tests, fix proxy wrapper of test functions.