Updated test-class