Tests + corrections