More work on the Adapter and test