Added unit tests and method stubs