further simplifications, new tests