Changes to how test input is loaded, support for proper tabbing