Update test structure & stability fixes