Removed test duplicating a common test. Resolved FIXME. Resolved completed TODO.