Cleanups, test enhancement