Update main and tests