Restored working tests