Fixing tests after adding hints