Unit test refactoring. New tables creation refactoring.