Further testing to guard against edge cases