Moved trait to own file and renamed parameter
repaired tests