Updated and tested the tests.