fix tests & mv base repo