Fixing sample code
Reorganizing tests
Adding sample code to tests