Changed tests to reference self instead of this for _super