Made some changes so tests run better.