Added tests made by others