added more test cases
Added constants, made semicolons optional