Fixing one of the test and pending the rest for the moment.