first attempt to make tests quicker, and maybe more confusing
merger