Fixed bug on test system