changes to fix rspec customer and invoice (sans create) tests
resolved merge conflict