Cleanup and more tests also changed to parse identifier instead of string literal in few statements