Refactored BuildXAxis and started cleanup of TestData