Simpler API now working including unit and property tests