Improve comments, tests and handle property format of '1' for osgi