API refactoring, add asserts, remove expectations
Update README