tests from 52f22c3e24a4 added.