first steps to simplify this

- tests now run with zuul -- currently failing