fix styles, add some tests