MockDatabase support
Mock changes