Added test and 'Dispose'.