Add more (untested) cases