Code style fix and new tests