[WIP COMMIT] Fix some tests