moved tests over
merging
fixing merge