Fixed old ref after backwards merge. Closes #17.
Merge test_base into test_head