minor reorganization of new classes in spades.js
a couple new tests