Updated Unit Test and initialContextSetupProcedure