Initial Pass at test suite