Close #42
More work on #42, get testing right...