Revised Routine for Unit Test from 16 Jan 2023