Add Strainer and fix tests