Fixed tests, continuing to improve