Little Refactoring.
Fixed Test.