structure change + test fixes