Add another instance
Remove needless argument from cost computation"
Add tests