Bills date fixes

and test tweaking