Test added, please review @jerith