Added tests from class