Fixed old tests