Wrote more tests and refactored colo model.