Restoring some tests which were removed by mistake