Fixed more formatting and added a test that does not quite work yet.