Integrated test_base.py from gh-426, added tests for new indexing and added
matrix indexing functioning.