Bug Fix

- Fixed a couple tests that were broken due to changes while getting the shell to work