update #3: Fix tests.