reorder make test to "fix" problems