Cleanup
Allow NULL values in condition
Updated tests