Removed transient fixtures
Added diff support