changed structured. Added more tests