Test cases and resource file updates

Ran Style Cop to remove all warning messages.