Updates for successful tests through #7