OS tests disabled until merge