Put all the functions into a Structure and added one test.