Added annotation tests and fixed validation errors