Add adapter base spec and clean up adapter base
Clean up adapter and add test