[OS-BUILD PATCHv2] Test: Broken code, do not merge