AspectValidator bug fix and unit test addition