fixed regexp for identifier
rewritten sample code in assertion form