Changes in unit tests: file reorganization, modifying error message when specie is tested.