Hi everyone,

Further fixes to test, let me know how it goes.