Merge pull request #147 from apache/tests-and-tweaks

tests and tweaks