Few test updates