Added shoddy autotests, newds work.