Remove unitests FIXME

Change-Id: I053594e238bab681490cfbc41d4da7b941fc9d70