New tests + fix