#52 fix. Fix of tests.