simplification and more testing