Uniform indexing for Bifrost
Fixed rspec