Started working on more tests