Moved data out of test code