WIP
Reviewing the status of test suite