Working on more tests