updating test hierarchy for easier testing