minor fixes, tests update