More import fixes
test profile restored
Template path fixed