Tests completed, final merged