Continuing to work through tests. 25 to go. Le sigh!