More tests. More bug fixes.