CARD #149
https://trello.com/c/sGHgu3jr

fixed some tests