Adding more thorough tests.