MOre integration tests; Royalty calculations
Wait roy, I'm pushing new code