slightly better setup, tests failing
Tests passing again