Add concept draft support + refactor tests