Some REPL Driven Development to fix bug - TODO: fix broken test
Fix test to correspond with bug fixed in previous commit