Added new tests, and continuing to migrate test cases over