remove requirement of Catch framwork
test updates
renaming some tests