fixed the tests and things
Merge branch 'feature/ui' of ssh://personal/codeflash/codeflash into feature/ui