Fixed WIP tests