Another fix for spreadsheet and finished the boundary value tests