WIP tests redone