Add more protocol tests
Parse type annotations correctly