Changing up old tests and adding new tests.