Renaming traits to make a more realistic example
Renames and making tests more realistic for EasyMock