Some progress on top level tests