Fixing some tests - just some refactoring.