Fix some more tests
missing elses
Special __invoke() forgetting