Small code & test review

@mkit