Added ModelAnnotation F Expression and first Test
Cleaned up test