Added a primitive test suite and backed out of a previous commit