Test fixed, proper cleanup...
Test fixed, proper cleanup...