Done more basetests