Add testfiles
namespace update
mock?