What an improvement Bruno!! Much better staying in the lower zones that time around.
You can push a bigger gear to get in a little more zone 2, you could even take some pulls and let her draft you on the flats if you find you are staying in low zone 1 for too long.
Regarding the FTP test, this thread is helpful.
Basically, performing the test outside on a steady hill is best. But if not you can use Zwift and lot of athletes that go this route prefer the climbs for their Field tests such as Alp du zwift. So if you cant get outside, I suggest going that route. I also suggest blaring some music that pumps you up if you are inside… but dont do that outside cause… safety first 