API 2: minor changes, added simple tests