JBTM-1678. Additional tests
JBTM-1678. Removed unused commented annotations