Resolved last test problems.