Fix failure of tests

Fix failure of tests + correction of assertEquals.