more tests and fakes
more tests and fakes