JRF: Updated Annotation and Scanner. Added test to prove functionality