Fixing broken test in blur-console and cleaning up some code.