Fix framenetreader tests
Fix framematcher unit tests
Fix remaining unit tests