re-arrange tests to be at top-level, and use "coverage" instead of custom script