Fixed copy/paste error and tests