Fixed merge. Added smoke test.