Splits test code from the actual code, and now handles attributes
correctly even when flowing across columns.