Fixing test framework 1