finished rewriting 3.5 and 4.1, removed code in comments
fixed bug in equals method in StringKeyWraper, writen tests for it