More updates, began datamart testing refactor