Tests refactoring - create needed buckets and views during test.