Introducing NullObjects as DataSource
Refactoring
Adapted tests