update tests to use 2-stage loading