Add better tests