More tests, some simplification.