roll back some bad test code