More tests. Hopefully nearing feature completeness.