Added unit test for #50 + removed already done fixmes.