BS-10405 Refactor tests and added the Index as new attribute