[adapt]: Added more unit tests