Tests fixed to comnform standard practices