Changed unit tests and index