More unit tests (most even pass!)