Complete and update the tests