Cleaned up and updated some tests.