better code style, fixing errors in unit tests