test for the costs written,
also added the needed methods in models, not implemented yet
Merge remote-tracking branch 'origin/master'