Fixed, repairing unit tests and merging...