Added some new stuff to one test, tried to create another.
Merge branch 'Unit_Test' of https://github.com/irblake/Spot into Unit_Test