Adding tests for RIs, adding methods to provide effective cost (which is how AWS reports it)