Some top test, probably others are needed
Comparison corrections