Added more tests, moved away from index