Adding more tests cases and test types.