Updated setup and spiral_test