Some minor cleanup.
Minor modification to classpath and remove blank line in test.