Update tests, add more