Added some additional testing and annotations