More tests.
Copyright changes. It's 2013:)
Refactoring - now null output values are skipped