Nice tests. Lets use the coverage diff @wedaly mentioned to figure out what is not covered yet.