modifed namespace serve and resolve tests