Restructure some assertion checking based on post commit feedback by Aaron and Tom.
R600: Cleanup some tests and add missing testcases