Added more stubs and implemeted a couple of tests