more assertions and use cases
fix tests