Removed support for non-camelcase properties
Added unit tests