Refactor test data model to be cleaner and support series