Some cleanings wip tests