Reorgines tests and added some more tests