restored disposeof method, leaving out delete as discussed. refactored unit tests accordingly.
Merge remote-tracking branch 'origin/amd' into amd