added lots of test stubs