Test fixes
Merge branch 'master' of https://github.com/cs371p-fall-2014/allocator-tests