Cleaned up tests.
r57