Fix + enabled tests
Minor