Added some more tests with stubs