Fixed tests before hacking further.