Rearranged and added more passing tests.