added conditional comments and filtering tests