pupet 3.2 tests, lint cleanup