Added traits to unit tests for clearer organization