Modified testclass