implemented more tests and added more test stubs