Fixed some issues with systembuilder and tests.