Really make all tests valid this time.
Merge pull request #134 from giakki/tests

Really make all tests valid this time.