Test and PEP8 fixes (OMS-281)