Partially fixed tests
Merge branch 'master' of https://github.com/adeel718/helloworld