Rearranged code and changed expected result (need to elimnate the need for this end-to-end test soon)