Remove int type requirement, revert TypeError in favor of None return

also update tests