Tests refactored.
Missing file references removed.