More tests. 396/428 uncommented.