Updated index file and better tests
Updated index file and better tests