Adds back overwritten code in smoke-test