Updates, new tests, moving on