Remove TestAdapater dependency