Added more TDD test cases, added more method stubs.