Updated / cleaned up tests.