Fix double-running tests (just use zeus)
Misc fixes, fix test