Cleanup of impossible ifs
Assertionless tests added