structure & interface test fixed