Added stuff to test case, and fixed what broke.
Fixed double empty line in main table.