refs #6065 added changelog and fixed some tests