fix/adjust some tests; minor improvements to some handlers