More short tests, changed local filter variables to be more common among the functions