Cleaned up a bit and modified test case.
Fixed test case.