Some fixes on test skeleton