And add simple tests?