Added some new tests and updated old ones.