Test can now handle new implementation of envelope