tests now greatly simplified