Project Work 8.something v3: Updating branch with even more test fixes!