Add tests and update params (use osfamily)