Update from Jappix + add tests