minor updates and expect test changes

Addresses a few of the comments