Test fixes for OS support