Updated testclass