Updated PR with fixme and test