Test improvements. Local test still now working.