Cleaned up the ordered relationship tests a bit.