Add a more thorough test