Working on testing code