Fixing Polykey
and all tests for release
#562
Merged
Polykey
and all tests for release
#562