Added namespace + process test + fix