Fixed CS
Updated tests using Finder adapters