Remove annotations from basic 02
Add tests for basic