Fix tests and use cases