#9 Restructure code and fix A rdata
Close #9 : Fix simplistic test that missed this