Merge: More work towards the first unit test.