Made some changes so the maven plugin actually works with CFv2

We migrated to CFv2 and noticed that the maven plugin stopped working. I have made some small changes so the plugin actually works again.

There was 1 unit test that I @Ignored because I could not get it working properly.