merged test and cli folders