Exclude test source from bundle build.
Minor code clean-up.