made tests more maintainable