resolved pull conflicts
api change fixes
fixes to unit tests (adjust hard coded limits of key sizes)