Remove adapter, improve unit tests syntax to increase readability.