optional floor layout, boardTest now tests generation, also modified floor