Minor modifications needed by scoped_ptr
Minor modifications needed by scoped_ptr + counter
Immediate updating of held file
Introduced common include file for tests
Introduced common include file for tests