Update unit tests
Swap names key/value