Minor fixes
Update test interface
Fix identifier recognition