Skip tests when building, don't keep running setup.sh
Fix bug where amendments can be missing the base bill.