Fixing old tests