More work on OS_TEST