Made some methods final inside test code