Fixed specs
Using class def for language instead of instance
directory_strategy is passed solution now
Added comments