Slightly updated tests for 6561