Cleaning & fix tests