Revert "TestWithSpigot"

This reverts commit e6812b68305ab5567550c24b6e72652d601ae127.