added tests for indexing numbers, cleaned up