Removed annotations, added tests