Add more tests.

This is ugly, need to fix now.