Commit WIP on cheep tests