TESTING: minor shuffling of test cases.
WYCS: fixes for #229