added test tools and stubs