Added tests in class