Move root to main aptly and update test