- proper fake objects implementation
- tidying up deprecated code