Clean up direct tests