added more tests and test stubs