Fixed up Store Frameworks, Codecs frameworks and Codecs tests