added some setup infrastructure
tests pass again