final exam test fixes