Working on more testing