Added more unit-tests for replacing disk directory contents