update tests class a bit to use generic base