fix tests -- some still broken