Change Test Cleanup
Remove dispose methods
Merge pull request #1 from roeldewit/master

Merge from master to dev