JAL-2346 remove refactored fields, fix test for above threshold