... now with some tests