+tests. minor fixes