fix top-level tests, add a new test