Removed IDENTIFIER rule; Added tests