Fixed asserts to be not string based, but value based so that order does
not matter