Fixed tests and Lailson's feedback