Adding new test suite and fixing bugs.