Label all the tests
Format code and improve comments
Further doc/formatting improvements
Make main function do something more interesting