Fix tests.
Fix tests part 2.
Merge pull request #8 from u-c-l/repair

Just fix the tests.