Support whitespace at the end of a block
Expand tests