made tests neater