restructure to match openpyxl 2.1
start working through new tests