JAL-2816 JAL-2835 additional tests to include colour/filter by attribute