WIP: Fix mock usage in tests

Fix problems introduced in 1c5e918a :

• mock cleanup was not correctly used
• code was indented with 4 spaces

Also use different partition ids in each tests so that it's easier to detect this kind of isolation problems and to understand where it comes from.