curly braces not required
removed unused tests
renamed test files
removed unused test files
updated tests