new test
Some refactoring.