more code rearranging, finished up another test