Fixed issue 21
Fixed issue #23.  Filter out deprecation warnings in unit tests.
Minor code cleanups