remove internationalization (for now)
moved test cases
fixed incorrect test class spelling
test for composite guard