b=2623

r=ccooper

Fix problem where none of the tests were checking for a successfull cleanup.
Error in cleanup when modules are still loaded.