Removed extraneous logic from testing.