Test updates/stabilization, some tests moved to future group