Fixed bug on extra tests