Add some tests. Actually, I guess these should be generic...