Refactoring of Assert class and improved test cases