major update 2: tests broken