Added test suite.. I'll run this tomorrow and fix whatever comes up.