Merge "Reactive remaining Junits tests for Al migration"