Did a lot of work setting up test cases for the building block classes.