Refactor test, sample and warehouse datasets