Adds more thorough tests