rearranging
fixed one test