Fixed NaminStrategyInterface and added tests