Rudimentary dirty checking
Set integration tests pass