Add stub for functional suite
Eliminate duplicate resolve() call.