fix filters and finish layout tests