Add more helper functions and fakes.