[test] Working on the test suite