MISC: increase test coverage and cosmetics