CCI Problem 1.1 + tests