Merge branch 'object-tests'
Merge branch 'master' of https://github.com/powkhenai/HW5