Add specs and integration specs WIP