Updated unit tests, started test cases