more tests, cleaned up ordering, changed some names