Rename files, add specs for ch5 and solve one ch5 test.