Merge with Tom and added layered FilterTest