Allows redefining to the same thing, adds some tests