Added initial support for tracks and some additional tests