Adds track interface, updates tests, affected class