One more thought about being forced to work with PsiElement logic methods: I've been finding there is an increased chance the PsiElement factory methods may be more unstable when you start writing the testing. These end up being tricky and more work, so if you get stuck, I'm happy to help out