Civil here too. Passed first time, but I didn't feel real great leaving the test. It really covers a lot, and I have no idea how you're supposed to know some of the stuff without the extra resources once it transitions to CBT.
Water was a struggle for me, but I focused on working the practice...