re-arranged methods, changed test case slightly
re-arranged methods, changed test case slightly


doctrine/annotations,crazycodr/annotations,iamluc/annotations,kinncj/annotations,iainconnor/annotations,FabioBatSilva/annotations,codesource/annotations