Cosmetics & unit tests