Fixed issues. Now the framework tests pass