test cleanup, alias bug fix