Updated project indexing rules; updated tests