Unit test fix
Rewrite old configurations #AM-87 state Doing