Test and bug fixes.