SupportedFramework fixes
Unit tests