Fixed bug in regex which was causing some issues on AES crypto benchmark...

Class with end hyphen ( - ) was not being parsed. Added tests too.