Greatly simplify tests