new mock structure, and start using it in tests