Renamed arguments
Added missing callback.fail() in some testcases