Entities Refactoring + Astract Factory + DummyTest