Fix (well not really) tests