Added tests for Spice, weeded out a couple of bug.