cleanup (de-lint etc) + fixing 4 bugs in tests