Starting to fix tests, etc.