auto improvements, more regression tests