[WIP] First round of tests pass