- up to 5.4.0; drop tons of unneded defines; run tests