Move test into other namespace to prevent fatal and added FIXMES

Change-Id: I98d39a20f03158fd6b982eb8026e535962a2b4f1