Fixed broken test and reverted previous commit.