Updates tests. Need to figure out pending ones