Update test/main from master