fix bill tests/etc