Add partially working tests