Updated test class
Updated FilteringLayout