Refactor to make sure new bucket is removed

Seems that assertTrue returns immediately when it fails, so we need to
make sure it is the last statement.