Tests fixes
Merge branch 'master' of github.com:arjunkarpur/prog6

asdf