some tests and config tweaks