Refractor tests, tests are now idependent.