@garborg's updated tests