(Test/)Profile minor additions