Rename files, add tests
Exercise 5