updated tests for improved code coverage
updated traits to conform to FIG naming conventions
update trait-implementing classes to use new class names