Foundation for future architecture changes and more physics testing