remove old commentted code.
add post assertion for 'where' and 'where' contains.