adding tests and adapters