cradle test fix

fix 1
cradle test fix2
cradle test fix3
cradle test + junit
small fixes
Merge pull request #274 from l1fe/master

JUnit Naumov Igor 296