Continued refactor of siege tests