Started working on a testing suite