Added new traits and tests for them.