hw2 - fix 2c + tests