Changed return values to make testing easier
Added todo about database constraint
Added storage class test suite