Fixed a few tests. Added annotation