#JC-1205. Fixed tests.