And add run-tests. oops. Serves me right for trying to make a clean tree :p