simplified tests and addde annotation tests