Added some new tests and reordered them.