tests: Wrote new tests
Added new test classes