Fixed failing tests. DOH!"