added two test suites, and fixed issues accordingly