Topic: fix tests (I hope) && remove useless spaces.