Clean up integration tests a bit
Remove duplicate tests