Fixing a problem with removed files. Added test. Tests simplified.