Remove some redundancies
Implement all results, adapt tests where there were errors, and activate
all tests