Add test.
Lots of debugging...