improved indexing, cleaned up constructor
switched back to larger test file