Updates, new tests.

Updates, and some annotation testings.