Now with some tests