Feature/218 improve cost coverage

https://trello.com/c/vJkBKKQj/218-improve-cost-coverage