Working on new tests