Adding Final Test resolution