use underscores in tests, add tests for add order