#20 Beginning to re-write tests