New and redone tests to accomodate metacache; Cleanup