Extended utils tests + codestyle