Fixed paper, and added tests