Finalizing the tests and also fixing up some minor details in the main
project.