Simplify ; run tests in make pre