Added more strict tests cases