Remove SpiffyTest dependency
Fix travis
Add tests