Added OnEntryTests