Added more filters and improved testing coverage