Added sources + tests