IMprove unit tests