Added more tests and basic copy functionality