Added more tests
Modified get filter based on arg length