Small commit with first tests