unit instances refactoring to support multiple scenarios