Added new tests + costs back + sanity scalacheck + function stubs