WIP
Additional test fixes