Removed indexing for now and added more robust specs.