Fixed up rakefile

Combine all the tests so we don't mess with coverage calculations when
integration tests are run.