#87 Implementation done + correct problem with tests