4 weeks is still early.....id say keep getting your BT's and keep your chin up...i hope it is a BFP!

As for the the water question...no question is ever silly to ask..im sure theres lots who want to know the same thing but dont ask. Im not sure if it waters it down....i would always drink lots if i had to do urine tests to ensure i could pee when the time came..LOL