Add better, more robust tests