Add detailed type annotation test
Fixup pom
Fix a couple bugs