More tests. Still incomplete.