SOL-20 adding type filter with some deafult values
SOL-20 basic testing